merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 8 Dec 2011 01:41:00 +0000 (10:41 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 8 Dec 2011 01:41:00 +0000 (10:41 +0900)
commitdac8d930669e0f02692e77fff587332846fd9457
treee20cdbdd9e0e6ae3191b17ba1244c2d56b249585
parente98a014dc818b48e87f9808f52d31d08484402ba
parentab7421eb21bbdc4fe1307b4338138d2d01e9b260
merge trunk